Merge branch 'master' of https://github.com/rust-lang/cargo into allow-examples-to...
authorKalita Alexey <kalita.alexey@outlook.com>
Tue, 17 Jan 2017 19:25:07 +0000 (22:25 +0300)
committerKalita Alexey <kalita.alexey@outlook.com>
Tue, 17 Jan 2017 19:25:07 +0000 (22:25 +0300)
commitcc0745047c8ef5db9f8c27be0368ded8abdaeb01
treef226f49ad3738019f68118cb36737fa2aed0f57e
parent47b25fd357571368d19f83a09cd0f4595d4cf4e4
parenta43403b3ec64cb4940250e02e616729e67e442f9
Merge branch 'master' of https://github.com/rust-lang/cargo into allow-examples-to-be-library
src/cargo/core/manifest.rs
src/cargo/ops/cargo_compile.rs
src/cargo/ops/cargo_rustc/context.rs
src/cargo/util/toml.rs